Minor server optimizations